From 3bd384cfd9891504912cfb93fa20c5ccc9c4f140 Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Mon, 20 Feb 2006 11:20:42 +0000 Subject: [PATCH] Don't define ARCH_APICTIMER_STOPS_ON_C3. Protect the calls to the switch_APIC_timer_to_ipi and switch_ipi_to_APIC_timer functions since we don't implement smp_send_timer_broadcast_ipi(). From: Jan Beulich Signed-off-by: Christian Limpach --- linux-2.6-xen-sparse/arch/i386/kernel/apic-xen.c | 7 ------- linux-2.6-xen-sparse/arch/x86_64/kernel/apic-xen.c | 7 ------- linux-2.6-xen-sparse/include/asm-i386/apic.h | 2 ++ linux-2.6-xen-sparse/include/asm-x86_64/apic.h | 2 ++ 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/apic-xen.c b/linux-2.6-xen-sparse/arch/i386/kernel/apic-xen.c index 6e0b15e4f7..07a0994307 100644 --- a/linux-2.6-xen-sparse/arch/i386/kernel/apic-xen.c +++ b/linux-2.6-xen-sparse/arch/i386/kernel/apic-xen.c @@ -85,13 +85,6 @@ int get_physical_broadcast(void) return 0xff; } -#ifdef CONFIG_XEN -void switch_APIC_timer_to_ipi(void *cpumask) { } -EXPORT_SYMBOL(switch_APIC_timer_to_ipi); -void switch_ipi_to_APIC_timer(void *cpumask) { } -EXPORT_SYMBOL(switch_ipi_to_APIC_timer); -#endif - #ifndef CONFIG_XEN #ifndef CONFIG_SMP static void up_apic_timer_interrupt_call(struct pt_regs *regs) diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/apic-xen.c b/linux-2.6-xen-sparse/arch/x86_64/kernel/apic-xen.c index a1c434cda5..3152b914f9 100644 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/apic-xen.c +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/apic-xen.c @@ -58,13 +58,6 @@ void ack_bad_irq(unsigned int irq) ack_APIC_irq(); } -#ifdef CONFIG_XEN -void switch_APIC_timer_to_ipi(void *cpumask) { } -EXPORT_SYMBOL(switch_APIC_timer_to_ipi); -void switch_ipi_to_APIC_timer(void *cpumask) { } -EXPORT_SYMBOL(switch_ipi_to_APIC_timer); -#endif - int setup_profiling_timer(unsigned int multiplier) { return -EINVAL; diff --git a/linux-2.6-xen-sparse/include/asm-i386/apic.h b/linux-2.6-xen-sparse/include/asm-i386/apic.h index d30b857157..ac93e81487 100644 --- a/linux-2.6-xen-sparse/include/asm-i386/apic.h +++ b/linux-2.6-xen-sparse/include/asm-i386/apic.h @@ -132,10 +132,12 @@ extern unsigned int nmi_watchdog; extern int disable_timer_pin_1; +#ifndef CONFIG_XEN void smp_send_timer_broadcast_ipi(struct pt_regs *regs); void switch_APIC_timer_to_ipi(void *cpumask); void switch_ipi_to_APIC_timer(void *cpumask); #define ARCH_APICTIMER_STOPS_ON_C3 1 +#endif #else /* !CONFIG_X86_LOCAL_APIC */ static inline void lapic_shutdown(void) { } diff --git a/linux-2.6-xen-sparse/include/asm-x86_64/apic.h b/linux-2.6-xen-sparse/include/asm-x86_64/apic.h index bdbd893561..79db75f178 100644 --- a/linux-2.6-xen-sparse/include/asm-x86_64/apic.h +++ b/linux-2.6-xen-sparse/include/asm-x86_64/apic.h @@ -105,11 +105,13 @@ extern int disable_timer_pin_1; extern void setup_threshold_lvt(unsigned long lvt_off); +#ifndef CONFIG_XEN void smp_send_timer_broadcast_ipi(void); void switch_APIC_timer_to_ipi(void *cpumask); void switch_ipi_to_APIC_timer(void *cpumask); #define ARCH_APICTIMER_STOPS_ON_C3 1 +#endif #endif /* CONFIG_X86_LOCAL_APIC */ -- 2.30.2